From c9d626523d103977eddf98f9e383bb2043c1371c Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 20 Aug 2010 13:56:30 +0200 Subject: [PATCH] Remove gtkalias from style context code. --- gtk/gtkcssprovider.c | 5 ----- gtk/gtkstylecontext.c | 5 ----- gtk/gtkstyleprovider.c | 5 ----- gtk/gtkstyleset.c | 5 ----- gtk/gtksymboliccolor.c | 3 --- gtk/gtkthemingengine.c | 5 ----- gtk/gtktimeline.c | 3 --- gtk/gtkwidgetpath.c | 3 --- 8 files changed, 34 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index f9780c2420..058c1d3450 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -27,8 +27,6 @@ #include "gtkanimationdescription.h" #include "gtkcssprovider.h" -#include "gtkalias.h" - typedef struct GtkCssProviderPrivate GtkCssProviderPrivate; typedef struct SelectorElement SelectorElement; typedef struct SelectorPath SelectorPath; @@ -1821,6 +1819,3 @@ gtk_css_provider_get_named (const gchar *name) return provider; } - -#define __GTK_CSS_PROVIDER_C__ -#include "gtkaliasdef.c" diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index f7f236d262..6c3fa2b46f 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -32,8 +32,6 @@ #include "gtkanimationdescription.h" #include "gtktimeline.h" -#include "gtkalias.h" - typedef struct GtkStyleContextPrivate GtkStyleContextPrivate; typedef struct GtkStyleProviderData GtkStyleProviderData; typedef struct GtkStyleInfo GtkStyleInfo; @@ -2085,6 +2083,3 @@ gtk_render_handle (GtkStyleContext *context, _gtk_theming_engine_set_context (priv->theming_engine, context); engine_class->render_handle (priv->theming_engine, cr, x, y, width, height, orientation); } - -#define __GTK_STYLE_CONTEXT_C__ -#include "gtkaliasdef.c" diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c index 4240176f24..2c23a80edb 100644 --- a/gtk/gtkstyleprovider.c +++ b/gtk/gtkstyleprovider.c @@ -23,8 +23,6 @@ #include "gtkstyleprovider.h" #include "gtkintl.h" -#include "gtkalias.h" - static void gtk_style_provider_iface_init (gpointer g_iface); GType @@ -99,6 +97,3 @@ gtk_style_provider_get_icon_factory (GtkStyleProvider *provider, return iface->get_icon_factory (provider, path); } - -#define __GTK_STYLE_PROVIDER_C__ -#include "gtkaliasdef.c" diff --git a/gtk/gtkstyleset.c b/gtk/gtkstyleset.c index a9df3a1201..5c634100e0 100644 --- a/gtk/gtkstyleset.c +++ b/gtk/gtkstyleset.c @@ -29,8 +29,6 @@ #include "gtkanimationdescription.h" #include "gtkintl.h" -#include "gtkalias.h" - typedef struct GtkStyleSetPrivate GtkStyleSetPrivate; typedef struct PropertyData PropertyData; typedef struct PropertyNode PropertyNode; @@ -882,6 +880,3 @@ gtk_style_set_merge (GtkStyleSet *set, } } } - -#define __GTK_STYLE_SET_C__ -#include "gtkaliasdef.c" diff --git a/gtk/gtksymboliccolor.c b/gtk/gtksymboliccolor.c index 569f3066f0..9b9386b4cd 100644 --- a/gtk/gtksymboliccolor.c +++ b/gtk/gtksymboliccolor.c @@ -240,6 +240,3 @@ gtk_symbolic_color_get_type (void) return type; } - -#define __GTK_SYMBOLIC_COLOR_C__ -#include "gtkaliasdef.c" diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c index ef7a863cb5..10f4117557 100644 --- a/gtk/gtkthemingengine.c +++ b/gtk/gtkthemingengine.c @@ -26,8 +26,6 @@ #include #include -#include "gtkalias.h" - typedef struct GtkThemingEnginePrivate GtkThemingEnginePrivate; enum { @@ -1919,6 +1917,3 @@ gtk_theming_engine_render_handle (GtkThemingEngine *engine, gdk_color_free (bg_color); } - -#define __GTK_THEMING_ENGINE_C__ -#include "gtkaliasdef.c" diff --git a/gtk/gtktimeline.c b/gtk/gtktimeline.c index b4c034d700..348011c768 100644 --- a/gtk/gtktimeline.c +++ b/gtk/gtktimeline.c @@ -733,6 +733,3 @@ gtk_timeline_set_progress_type (GtkTimeline *timeline, priv = timeline->priv; priv->progress_type = progress_type; } - -#define __GTK_TIMELINE_C__ -#include "gtkaliasdef.c" diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c index 0f5e420a41..933a2dc0c7 100644 --- a/gtk/gtkwidgetpath.c +++ b/gtk/gtkwidgetpath.c @@ -597,6 +597,3 @@ gtk_widget_path_has_parent (const GtkWidgetPath *path, return FALSE; } - -#define __GTK_WIDGET_PATH_C__ -#include "gtkaliasdef.c" -- 2.30.2